From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 31 Mar 2020 19:07:59 +0000 (+0200)
Subject: screenShield: Wake up on deactivate()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~544
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fbe2e30f389a10b5b155ab7b2179d9fd718e762b;p=gnome-shell.git

screenShield: Wake up on deactivate()

Usually the screen is woken up before the shield is deactivated, but
it is also possible to unlock the session programmatically via the
org.gnome.ScreenSaver D-Bus API.

The intention is very likely not to unlock a turned off screen in
that case. Nor does it seem like a good idea to change the lock
state without any indication.

Waking up the screen is more likely to meet expectations and is
more reasonable too, so do that.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1158
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 1107a5ce9..86221a309 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -498,6 +498,8 @@ var ScreenShield = class {
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
+        this.emit('wake-up-screen');
+
         if (this._isGreeter) {
             // We don't want to "deactivate" any more than
             // this. In particular, we don't want to drop